* src/lread.c (readchar): Don't read from a dead buffer. (Bug#14280)

diff --git a/src/ChangeLog b/src/ChangeLog
index bf5a590a7a6e7ff528adf3268cf8f3b7a3f5e8f5..5ca745b84032fd46f579b19dc4d97f0831b8ad93 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-07  Glenn Morris  <rgm@gnu.org>
+
+       * lread.c (readchar): Don't read from a dead buffer.  (Bug#14280)
+
 2013-05-07  Jan Djärv  <jan.h.d@swipnet.se>
 
        * xfns.c: Move misplaced ifndef USE_GTK from previous checkin.

diff --git a/src/lread.c b/src/lread.c
index 1a8a57e57a779c55f0028915d2f3563398e6d672..272f252cf7b6c4a705eae1954c8a5e0d1f26260b 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -201,6 +201,9 @@ readchar (Lisp_Object readcharfun, bool *multibyte)
 
       ptrdiff_t pt_byte = BUF_PT_BYTE (inbuffer);
 
+      if (! BUFFER_LIVE_P (inbuffer))
+       return -1;
+
       if (pt_byte >= BUF_ZV_BYTE (inbuffer))
        return -1;